Merge changes Ifbeed546,Ia283252d,I28c85736 into oc-dr1-dev

* changes:
  More aapt2 aar prebuilt fixes
  Use framework resources for prebuilt aars with aapt2
  Don't attempt to write to / for aar prebuilts