Merge "dalvik: fix mips build"