Merge "Unify reference table dump" into dalvik-dev