Merge "stagefright: Add HLG in ISO transfer table" into nyc-mr1-dev