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

Change-Id: If3da7f72aaed3e1f6dad3772000de4b8fadb708d