Merge "Fix host oat_test on portable." into dalvik-dev