Merge "Revert "libbinder: require shell/root UID for shell""
am: 5fa93fffe4

Change-Id: Ida79e89bdb3c20f6f5df38ea1f2a6b17601b6b76