Merge "AAPT2: Create Makefile"