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

Change-Id: I1535b54ab591f8e0f8d50c95623cb88dd00d18c2