Merge "Don't leak hwservicemanager binders" into oc-dev