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

* commit '6102db9188b8b37744a8342c101eb988ae4a0f81':
  Revert "Camera2: Use hidden APIs"