Merge "Fix testMediaCodecActivity." into pie-cts-dev am: 222fb2132a

Change-Id: Ic314c851ac0c00f59919f152d2cfbabb847435c7