Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION"