Merge "stagefright: Enhance MPEG4 writer/extractor to store/retrieve layer info" into nyc-mr1-dev