Merge \\\\"Fix missing patchoat dependency for dex2oat test.\\\\" am: dadc0751 am: e2555d84 am: a322e08f am: 1909f607 Change-Id: I008651af9fe9962a7b16666e95958c62d21604ab