Merge \\"Fix inefficiency in APK entry data alignment.\\" am: a85e0aa883
am: 7fe6ba2197

Change-Id: I97934b2a4cdfabb463f5012149ef28a15768c321