am 34a63ba4: Merge "Ensure RenderScript tracing is always balanced via try/finally"

* commit '34a63ba4d79567146f2724c47b06ffa4f21639da':
  Ensure RenderScript tracing is always balanced via try/finally