Merge "Fix dex location filtering in dex2oat"
am: 1990bdab70

Change-Id: I14de9b458651b497c78126cbb1a406e633be2f9c