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

Change-Id: Iea9cd6310f913f0f92c33371bb2fffaf1b3328ef