Merge "GATT: put include declarations before characteristics in service"