Merge "Move the compiler into C++." into dalvik-dev