Merge "Convert gsid to use the dynamic AIDL service infrastructure" into rvc-dev am: 6a10fea4 am: 3a5402d9 am: 17833034 Change-Id: I1c894fb8285bd03ee6b1d39c2d0ee512a9f2adb6