Merge "Update dex file magic number." into dalvik-dev