Merge "bluedroid: audio_a2dp_hw 64 bit compile issues"