Update notes for submitted changes

* Revert "stagefright: Fix mismerge"