am a512c1ca: am 7b445a8e: Merge "Fix rotation in camera2 API" into klp-dev

* commit 'a512c1ca6322b54b6a74be01be53d537f5a81da4':
  Fix rotation in camera2 API