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

Change-Id: Ia82c41019c18342f4971b4803fa898999c67d7b9