Merge "Revert^2 "libbinder: introduce guards for getCalling*""