Merge changes I7315059b,If2dd13d8

* changes:
  Binder: don't call getCallingUid for RPC calls
  Parcel: lift 'isForRpc' here from native