Merge branch 'pie-gsi' of https://android.googlesource.com/platform//packages/apps/Gallery2 into HEAD

Change-Id: I752b166d0fd4f001cedabcc6245bd48e1f66726d