Merge "generic_no_telephony: always include stub audio/audio_policy HALs"