am e0cabf8e: am e4ed4708: Merge "camera2: Fix ABI for new tags." into mnc-dev

* commit 'e0cabf8e936984515100ecb8dcf480e6ddb5a072':
  camera2: Fix ABI for new tags.