Merge "Removed audio A2dp and Hearing Aid from device.mk" into tm-dev