Merge "Fix bug in APK entry alignment." into nyc-dev