Merge "libbinder: Fix __assert macro in Trusty" am: 7e560fe534

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

Change-Id: Iffadf3c1133ab4db73a9351ac0c0d82229c0c2ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>