Merge "Fix x86 ABI in PinnerService"