Merge "Use apex name in apex_manifest.pb as the mount point" am: 413440c5b9 am: 0d8d920e1d am: 33db956877

Change-Id: Iabe47ac500578f45fc16a64392a86c768369626b