Merge tag 'android-8.1.0_r15' of...

Merge tag 'android-8.1.0_r15' of https://android.googlesource.com/platform/packages/apps/Gallery2 into HEAD

Android 8.1.0 Release 15 (OPM1.171019.021)

* Excludes "Adaptive icon for Gallery2 AOSP" since we have our own icon

Conflicts:
	Android.mk
	AndroidManifest.xml
	jni/Android.mk
	jni/filters/geometry.c
	proguard.flags
	res/values/colors.xml
	src/com/android/gallery3d/filtershow/pipeline/Buffer.java

Change-Id: I003571ce6e7719e4d110fd9b546126e52eef1204