Merge "Use apex name in apex_manifest.pb as the mount point"