am f280130f: Merge "Remove the unused __system_property_wait."

* commit 'f280130f3fd6719cee3a4cb42155dcef44665ea0':
  Remove the unused __system_property_wait.