Merge "Revert "android: binder: Fix suspicious indents""