Merge "Remove InterruptedException from MediaParser" into rvc-dev am: 315b8782 am: c285be9e am: a6233d92 Change-Id: Ic20ced4f81df3be55f51b405121db6369813a3c1