Merge "libbinder: waitForVintfService" am: e13f284c64 am: d42b0eb73f
am: fec67a6c64

Change-Id: I82494569a41b2b61b1ee8bc8b42e569a453f0ba5