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

Change-Id: I3264cef92eaad04af61a146da07ae2d3e59ceb61