Merge "libbinder: remove unused context variables" am: 280af8eb16 am: 3219ae64bc

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1416688

Change-Id: I2b1c097d241c2cfe0fd4f188053fbc38f4e62282