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

Change-Id: I8588261d05a44b1e23d9a68a7a334993f5e4f83b