update to 4.3.14 (multi)
Merge branch 'upstream'

Conflicts:
	smali/com/android/gallery3d/app/PhotoPage.smali