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

Change-Id: I518e9f6270848bb2ae1f6024953106a32eac49b1