Camera2: Remove aapt warnings

Change-Id: I4f02d2a8bd1a230326fca70c3deafb31987a8b84
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into cd-4.4