Merge "libbinder: waitForVintfService"
am: e13f284c64

Change-Id: I9a1b783daadfcd7a6584cb9d23c9ce1293a4a05b