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

Change-Id: I3fa9023ab1c74902aee7727ee2e879181ff7307f