Camera2: missing AOSP translation

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