Merge "Version __system_property* symbols for lp64 platforms"