Merge "Revert "Implement AAPT Bundle format""