Merge "Revert "Split libmedia into libmedia and libmedia_native""
tree: 17179b49680f4c242c80ecd1dc9887fcab6ecbdb
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/