am e61edab7: am 878af92f: Merge "Revert "Updated prebuilts for RenderScript compatibility library.""

* commit 'e61edab711567bac2b072d540dffb971d281c3ba':
  Revert "Updated prebuilts for RenderScript compatibility library."