Merge "Fix bug in APK entry alignment."