Merge "Revert "libbinder: require shell/root UID for shell""