Merge "RenderScript-specific build updates for LLVM rebase" am: 9e73fb6332 am: 97f259ec41 am: 9570b53f9c
am: 9ae3b219ca

Change-Id: I2e7a9f802b8e30bcff4956103a8a4602d5009281