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

Change-Id: I8c1b8116ab66c83e9b73f103adaf6237e51a6c1f