Merge "Create a header-only library for atrace in platform NDK builds" am: f1e3232bd2

Change-Id: I01b376e95bb61c7612b18c1d5d77393f073da1cd