Merge "Separate LE scanner and GATT client BTIF interfaces (2/3)" am: 86f508d45d
am: d3ea3edc18

Change-Id: I711b71f5f00a4ab52bf5edda7e654c35ff0e305c