Merge "Store entry alignment information in APK."