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