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

* commit '20864b088d1fd615f892f9415cf6ff634eeff9ff':
  Revert "Make Gallery2 use platform RenderScript"