Merge "Fix bug in APK entry alignment." into nyc-dev
am: 6bc1d30

* commit '6bc1d30396539ba132c2ead41945f913cc5ffef6':
  Fix bug in APK entry alignment.