Revert back to AOSP gallery2