Merge "Make MediaParser match ExoPlayer's sniffing order" into rvc-dev am: 2c89e32d34 am: cb364464fc

Change-Id: I238bfd37e4d19237b20b75aa527a67a72c444ae6