Changes in audio_policy.conf
Bring mixer_paths.xml in line with CAF
Disable proximity check on wake
Disable sidetone handset and headphones
Increase handset speaker gain
Small cleanup in init.qcom.rc
Adjust headphones gain
Merge armani-dev updates