Merge changes Ibef28507,Ia858de22,Ide3050ec,Ib6e00be4,Ib37ce89d, ...

* changes:
  Use a srcjar for aapt and aapt2 output
  Move R.txt and make aapt2 generate it
  Move aapt2.mk before java.mk
  Remove redundant renderscript_target_api computation
  Move java renderscript support to java_renderscript.mk
  Use srcjar and resource zip as output of renderscript rules