resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3
am: 8906021aec

Change-Id: I12f009bc41c7d3ea0e1799bc14731412f5157a40
tree: c031169e1c500b3d684d591e0f6c206dd2ff3b85
  1. camera2/
  2. common/
  3. framesequence/
  4. photoviewer/
  5. widget/
  6. CleanSpec.mk