Merge "stagefright: fix typo in HEVC handing at MPEG4Writer" into nyc-dev