[automerger skipped] Merge "Replace framework.jar with framework-minus-apex.jar" am: df5cd39198 am: 8529d01c84 am: af51e9e5fd
am: 7e4fff0d6c -s ours
am skip reason: change_id Ia12d5984b011a54bd8ef708d0f552298a6ddec8a with SHA1 911cd4faf8 is in history

Change-Id: Ib5e333b2625f9b78e67717ef75d635465218cfa4