Merge "Delete unused headers in media/libmedia/include/media" am: 887cb9ea94 am: a47789fdff
am: 7530afeffb

Change-Id: If7a43a0a99e1496cbd2303182c902b103f22c219