Merge "Limit the compat symlinks to ART binaries." am: 50e408db2d am: ac2e66091a
am: 33e1148b23

Change-Id: I2ae31f7389dafd3edd5ad578e54be6dda35fdb0c