am 0ee780a9: Merge "Ensure RenderScript tracing is always balanced via try/finally" into mnc-dev

* commit '0ee780a9934f1cc9da7dd82e73907336a86b5be8':
  Ensure RenderScript tracing is always balanced via try/finally