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

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