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

Change-Id: I1d926387baf148ccf8eb51571a3a02c97794605d