resolved conflicts for merge of d306cc81 to master

Change-Id: Ib593b7719a837de12605e8c75904634843298ba1
tree: 2e1a99949a5076641ba453bf75cc5e458d2225fd
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/