Merge "Fix prebuilt library dependency for multilib build"