Merge changes I93364c74,I5ca831b8

* changes:
  Exclude MTP implementation from simulator build
  Fixes for simulator build on lucid
tree: 1f0faf13f65d523fc6f1ed42f2846c6039c0124f
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/