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

Change-Id: Ib668bbcd3592eda96a2b6880acf34092e6bb8f1f