Merge "Enable building ATRACE stubs on Windows"
am: 8f5f643c57

Change-Id: I73d524a79c8144ba88ee69feb80a27aab596b57f