Merge \"Fix missing patchoat dependency for dex2oat test.\"
am: dadc075149

Change-Id: Ia4a0f663f186c94ef8bcf632c6bd3285e2eae388