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

Change-Id: Ia0b0c2fb07b0c615045c568be2e1605684c95cdf