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

Change-Id: Ic2b5961baa0fb7d80f4cf69e4255377f3f42b6fc