Merge "matrix: add bluetooth.a2dp" into pi-dev