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

Change-Id: I2319c8cbbbf0d35d85922adfb9cc93db59eafc22