TrackEncoder fix for Part 1 & 2, v1.
Merge pull request #2 from shellylin/merge-omx-encoder

TrackEncoder fix for Part 1 & 2, v1.