am 4f4a1678: Fix Camera2 build.

* commit '4f4a16782537f6eb08c5cc3ed76831312770e170':
  Fix Camera2 build.