Merge "Change the symlink to system_ext" am: c992962503
am: 29adb8f0f2

Change-Id: I4b5e05fc6380984c6e1a0fc87fc40f790ee20520