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

Change-Id: I05e4297b7207ff41ee732b321b9143abaa19e3d7