Merge "Convert gsid to use the dynamic AIDL service infrastructure" am: 0791e886 am: 7e2b6500 am: d781c190 Change-Id: Ib9f7b94bf1db5a547f8e4176050a36c2c7062bb0