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