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

Change-Id: I46cc8c9cb168538bf9408a515725a0715f35fba5