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

Change-Id: I6c61904250595b38ce0e54be880061fe001bf15d