Merge "Revert "Make Gallery2 use platform RenderScript""