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

Change-Id: I1571ba36f08831d3bb74e683c8e79872981b67a3