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

Change-Id: Ifadd18770d7b44246c4dfa1f497f171ff646a126