Merge "Fixup a failing assert." into dalvik-dev