[1/2] Camera2: Storage configuration

PS2
fix build

PS3
added more options support for PhotoMenu

Change-Id: Ia06c935973be682049a967f0aa8c086db8d55e01
merge changes from Omni 4.4 into local branch