DO NOT MERGE: Hide new camera API. Not yet ready. Bug: 11141002 Change-Id: I4704bffb9ba36af47a66dc5b49cbba00be623aae