Merge "Fix <android/trace.h> doxygen formatting."