Merge "64-bit prep" into dalvik-dev