Merge "Hide warning in cutils/trace.h"