Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am: 8caef85235 am: b512f4ab42
am: d18d8fac61  -s ours

Change-Id: I4b99c669b012bde7631699d5e7ef0da874cc14d4