Merge "AAPT2: Allow <layout> in <activity> tag in AndroidManifest.xml"