am 0f5bae32: am 29da7be9: am 256ea6f3: Merge "Update RenderScript prebuilts for build-tools 23.0.1" into mnc-dev

* commit '0f5bae329c0698412752715e6fc3e319189edf39':
  Update RenderScript prebuilts for build-tools 23.0.1