am 7adaeb6e: am d6046a44: EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.

* commit '7adaeb6ed479f667bceaae0af27fa997eb6afea6':
  EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.