Migrate to apex_manifest.pb am: afaa457b6f
am: 396b925903

Change-Id: Ibc38120a3ac40a4c81f806749d87665741eb83e0