am 5be2d2af: am 0ed8c93c: am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev

* commit '5be2d2af80716c08b8626046df8977dbf925df85':
  Camera2: add metadata override