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

Change-Id: Ic7e31bc00ea5625dfabd68d67757f9fe3ddd6b12