Merge "stagefright: get stream header information from MPEG2 video tracks am:...
Merge "stagefright: get stream header information from MPEG2 video tracks am: 0dc8be97 am: 4bd13b79" into nyc-mr1-dev-plus-aosp
am: b18b7364
* commit 'b18b7364':
Change-Id: I52ad739c0ffec9fcd4ad5cb669e1ffd60150df19