Merge "Delete unused headers in media/libmedia/include/media"