Merge "Replace framework.jar with framework-minus-apex.jar" am: df5cd39198
am: 8529d01c84

Change-Id: Ie32e9bfd0f20c73dd4577255eb4a2eb0c0f2d9e5