Merge "Store entry alignment information in APK."
am: 85f004c6c5

* commit '85f004c6c5995da4f9175eb65b90f48f601d658d':
  Store entry alignment information in APK.

Change-Id: I937cd36edbce072bcf329699f2bd3265205a8a11