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

Change-Id: Id67eb36ee58e0fdb2829fd9ef65f39d34ec0cdbb