am ad2b04a6: am 901be0ae: Merge "camera2: Update Face class." into klp-dev

* commit 'ad2b04a6f167f8574c7e0efbf8c30b15fa966b5b':
  camera2: Update Face class.