Merge "AAPT2: Generate R.txt" into oc-dev