Replace framework.jar with framework-minus-apex.jar am: 466a158851 am: 61c02728fe
am: fba5b83d2f

Change-Id: I7093dd0d3021512431021a8e0625e57dbf0ab07d