Merge "Allow dex2oat to handle relative paths."