Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev
am: b6ba3d7e47  -s ours

Change-Id: Iab547a3c17869e99ec58022b11a27eeb2777c729