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

Change-Id: I8814042dc6f0a86c321b8bad4f89b0ecc12f3407