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

* commit '76978a040c690213e937d8301bc1df29b611f1a9':
  Revert "Camera2: Use hidden APIs"