Merge change 20586

* changes:
  Let java put #defines into renderscript