Merge "Make Gallery2 use platform RenderScript" am: 9f16042f46
am: 6a766a2e30

* commit '6a766a2e3000cb58dafac5a1a482e00b68b9bc11':
  Make Gallery2 use platform RenderScript