Merge "libbinder_ndk: AIBinder_getCalling(Pid|Uid)" am: 2d1e881aff
am: 61d15cb931

Change-Id: I1f8bb8ef43adfc99cf9659cae52f9952ea9ab606