Camera2: Update resources

Change-Id: I5443dce8cafbb64f5d655aa08a34725413765581
Camera2: Remove aapt warnings

Change-Id: I4f02d2a8bd1a230326fca70c3deafb31987a8b84
Merge branch 'cm-11.0' into kk_mkt