Merge "Fix inefficiency in APK entry data alignment."