merge from open-source master

Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
tree: 89ed91b26ca3e58f51278c0c58e77f56f1a766d8
  1. camera/
  2. cmds/
  3. include/
  4. media/