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

Change-Id: If9a63ecc723910cacf7c008e2ea83a0ef77015e8