Merge "Cleanup hwbinder getService code."