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