Merge "Audio V4: Add missing Android.mk" into pi-dev
am: 15c039af86

Change-Id: I2cce3b8189c6dd4cfdae2f8e2d0630ee43d02cc3