DO NOT MERGE Revert "Update camera2 API usage"

This temporarily reverts commit for unbundled branch 9c84812bba91831e1759c23e8c92082a8a5f44fd.

Change-Id: Ic4767cd27373c36dd77df4469f5006ced8746f9f
4 files changed