Merge "Refactor and improve mod-union tables." into dalvik-dev