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

Change-Id: Ifb5e8de499c4f37bcdf74730a9e14a2002b8c3be