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

Change-Id: I772d45715c4d2a0431bd48eff7d3b35054e33502