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

Change-Id: I199b76e76a9ed5d4e79ec54830060779eb27c548