Update notes for submitted changes

* stagefright: Fix mismerge