Merge "Convert gsid to use the dynamic AIDL service infrastructure" am: bd3a3389d3 am: d5c8e6e266

Change-Id: I2fd714aa90759e2cd8415ce11a6f34df21507876