Merge "Revert "Updated prebuilts for RenderScript compatibility library.""