Merge "Fix timeouts for android::base::WaitForProperty*"