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

Change-Id: Ibb48b0fedf7570491f000d518c13bbc8a6af274a