Merge "Support Windows builds for libartbase/libdexfile" am: 11fdb2a13e
am: e0980cc336

Change-Id: I677d7e1791b0d604a373df6bc31abfc3371b89bf