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

Change-Id: Iede377bab376afff8146ca6fdf9c88d326cf0487