Merge "Fix the target Linux builds of ART"
am: ded461e9df

Change-Id: I16a851ff3892b8842fd918ff7cbf38a2c7828185