Merge "stagefright: AMessage: allow finding, editing and removing entries" into pi-dev