Merge "Revert "Add gen_trace option to libbinder AIDL interface""