Merge "libbinder: Fix __assert macro in Trusty"