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

Change-Id: I56d2b0c8d466e78316497264b7ca96f6526b3d9d