Merge "Made libbinder's waitForService accessible in java" am: 3ef1b5e544
am: fa830219cd

Change-Id: I312f51b6a802754981bf642c587cbbdb3024cfbb