am 4cbb778b: am f280130f: Merge "Remove the unused __system_property_wait."

* commit '4cbb778beb9cfc6cae88468413c80430424e6438':
  Remove the unused __system_property_wait.