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

Change-Id: I2dd2fc1d5c123468fd55cc353c41bd3b9601a1b4