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

Change-Id: Ifecc9f0a17472d1158aac26f4c9bc0dcf30c0064