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

Change-Id: I9b39ef66c4b7e28f5f249b0d0dea0d4457c88fda