Merge "AAPT2: Move format related files under same directory"