am ca0a4a54: am 76978a04: am 6102db91: am 08f250d9: Revert "Camera2: Use hidden APIs"

* commit 'ca0a4a543ca13501132945a6e1c2ab349a0c77de':