Fix Power Shutter Exception 1 of 2
Merge github.com:ResurrectionRemix/android_packages_apps_Camera2 into kitkat1

Conflicts:
	Android.mk