Merge "ART isn't using the ART-specific linker features any more."
am: 52d7749335

Change-Id: I2ab78b7b7922df1e3e3e580ddbbc5e864b36b521