Merge "Cleanup hwbinder getService code." am: 9be24a3040
am: 4ede371d80

Change-Id: Ia0f3f88d8881f89cec6939dbb44d7dbbb8da9a7f