Merge "Update DartVM makefile to also handle building for x86 architectures"