am 16ed7e70: Merge "Camera2: fix doc build" into mnc-dev

* commit '16ed7e70c869e12eae4721d6b4380c05c3423c78':
  Camera2: fix doc build