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

Change-Id: I83a7077f07689dc57ac4d8828508443cc4385292