Merge "Gatt server cmd line addition"
am: ddb2e58651

Change-Id: I1db812b998fc818b34093e5be5af374c8cad05df
tree: e35a292a1387c5fb672246a2ce9d3b1243e8ade7
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg