Merge "Remove Binder.getOrigCallingUid()." into jb-mr1-dev