Merge "Mpeg4H263DecoderTest: Added AndroidTest.xml to run test with atest" am: 4e11414a2e am: ef462bcd2e am: 4e64727ccd

Change-Id: I26a7080a997bfc3dc35ede2dd7412ae8233ea260