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

Change-Id: Ic23f6231a097bb52264fa66d787a64088a5379f2