Merge "MediaTesting: Add Mpeg4 H263 Encoder Test" am: 7bf3eff877 am: 0d431dd1e1

Change-Id: I2f782c4b4b864f76f1b6bcfea440c33a024f299b