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

* commit '5fd0e46d242f718de629ec07cf540fa24b4a72ec':
  Ensure RenderScript tracing is always balanced via try/finally