Merge changes from topic 'rebase_r256229'

* changes:
  Switch to clang-2690385
  Update RenderScript build rules for rebase to LLVM r256229