Camera2: Remove aapt warnings

Change-Id: I4f02d2a8bd1a230326fca70c3deafb31987a8b84
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0