Merge "Update RenderScript build config and definitions."
am: dddd7738d0

Change-Id: I4a901ca9c2c9dcd7390d67f14e0e01679434a997