Merge "AAPT2: Allow <compatible-screens><screen> in AndroidManifest.xml"