Merge "Fix clean-oat" into dalvik-dev