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

* commit '2f9d782018ce9082f5393ff18746dd7db8a543a3':