Merge "Remove the unused __system_property_wait."