Merge "Recompress android.jar before packaging it." am: 104232e0fc am: 9fc8db483a
am: 94ab1ccfcf

Change-Id: Ifd4e73e497eac9e8131de44af2fe9a7f645f526b