Merge "Separate LE scanner and GATT client BTIF interfaces (1/3)"