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

Change-Id: I189bae02003f3e4ed9f3e87a90e08b9b7670a059