Merge "KeyMint: don't mix Binder and std shared pointers"