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

Change-Id: Ica877916f6781dd6b2ca08d5f5acfe1d64156d69