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

Change-Id: Iad50a326a3ca0a7404ebdd393310ab0a545e10e0