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

Change-Id: Ib1cd6099db5acc213351d857b238075dba91945f