Merge "Remove bad symlink for media/IMediaCodecService.h and media/MediaDefs.h"