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

Change-Id: Iee972ed5c51e866a1596cb00bf4dafdf61ad92e0