Merge "GATT Server refactoring (1/4)" am: 7e3cfe3081 am: b815613e3c am: db8127a7e2
am: 6104fe5e2d

Change-Id: I2eca4450751437860542faa522778dc9c501db6c