Merge "HwBinder: Clean up code, add logging"