Merge "Remove InterruptedException from MediaParser" into rvc-dev am: 315b8782c4 am: c285be9e5f

Change-Id: I75264631db6830c956d447d90468710eae2cb7c3