Add some libs for amrwb&amrnb + some cleanup