Merge "amrnb: Fix memory leaks"
am: beb800f0c7

Change-Id: Idd3676f4d12a27eaf186479de38ad788bab7bc25