Merge "amrnb: Fix memory leaks" am: beb800f0c7 am: 7521f507c5
am: a6665ce480

Change-Id: I99293013025b19c9b898ae461689d12df85073be