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

Change-Id: I1d8e204224ab39a8ac2909169d73963ce065057f