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

Change-Id: I2015e010bca7320d50f6d51ded4b33e9bac5beb5