Merge change 20046

* changes:
  Seperate Light and Sampler from RenderScript.java