Merge "AAPT2: Process <java-symbols> and private symbol package"