Merge "libbinder: require shell/root UID for shell" am: c5ae56685d
am: 386b133b54

Change-Id: Ib47f87f5806646983b9bc853b225a66c55a74401