Merge "Fix missing patchoat dependency for dex2oat test."