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

Change-Id: I954a88adba2b071f415cfc87ccc87d4029d8c86f