Merge "GATT Server refactoring (2/4)" am: d13954e8c6
am: fe4b1e47fc

Change-Id: Id4a88b39102b3acbc09e203e09637c40ae81bb89