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

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

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