Merge "Adding AidlMQDescriptor and GrantorDescriptor"