Merge "Update RenderScript build config and definitions." am: dddd7738d0 am: 4751b9e700 am: 527eee8b8f
am: b19c923c77

Change-Id: Icd8cc5bec95c4b78ebac4c71e3a17d0b4d744e83