Merge "AudioPackage11.mk: fix typo" am: 2f7b351010 am: 15b30f03f4
am: 8367ff5263

Change-Id: Ib6e954140ef689c561ec2f2429c1944833dd15c3