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

Change-Id: Ie311078c896f1f8afe6ac55423283d1d924e6199