Merge "Do not use clang lld for oatdump tests" am: a6ce173839
am: 0715150b89

Change-Id: I564f2232316247679a315fad7c9e4a2d4bd11ade