Merge "Create a header-only library for atrace in platform NDK builds" am: f1e3232b am: 0487c3a1 am: 566a7735 Change-Id: Iad51de44fe4d2e831856c1f501f956cff23f10f9