Revert "Merge tag 'android-6.0.1_r22' of...

Revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Gallery2 into cm-13.0"

This reverts commit 8a0ab8f5, reversing
changes made to 515039d1.

Change-Id: I913dca0c1e2e725ef4b1c60a88dc62078fffef04