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

Change-Id: I048318fc4191a806a71a369690311aba08c68818