[automerger] better mpeg2 TS elementary stream Access Unit parsing am: 371066d073 am: e3f5c363c5

Change-Id: Ia125464dcfe916d2d7d94df8501ea3b41bf9aab2