Merge "Revert "Make Gallery2 use platform RenderScript"" am: 643998123e am: 20864b088d
am: fc52c27cf0

* commit 'fc52c27cf0992e11c56f30c26784d142366eb5d7':
  Revert "Make Gallery2 use platform RenderScript"