resolve merge conflicts of 3802db4 to mnc-dev

bug:32338390
Change-Id: I304c0c8c646808e690918eae7d34f0852e2b0fa8
(cherry picked from commit fffaa9f25edddc6fa10512c1cc19f625c2abee8c)
2 files changed
tree: 9008e8c7c81057ff2ac925b58b6526ba0bb334b4
  1. CleanSpec.mk
  2. camera2/
  3. common/
  4. framesequence/
  5. photoviewer/
  6. widget/