Merge "Compile libdex as C++." into dalvik-dev