Merge "Fix memory leak in MPEG2PSExtractor"
am: 52a42dde36

Change-Id: Ifd76e5db8b4f33570de6c06cd204f59af902caf0