Merge "Add availability information to the <android/trace.h> docs."
am: dd2ded17b9

Change-Id: Id5259d4656d8c4026c0d3535139b9c8c3ba21fc2