Merge "Allow dex2oat to handle relative paths." am: 72fdec3928 am: 678ac3e24a am: 1828ee8400
am: ce69cd15f8  -s ours

Change-Id: Ifabf61405e1aa0201c04f14b19c078c3142ec734