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

Change-Id: I83769906e1e0e2a43b55b00895a4d5783378eedd