Merge "AAPT2: add flag for strict visibility"