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

Change-Id: I39767c9bb532c111d6827589da3299fccb3f6211