Merge "Implement android::base::WaitForProperty." am: 01003d40fc
am: d96f68ee21

Change-Id: Icbc1efd9293849d3b4cd9ccaba84eeacde974f9c