Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread