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

Change-Id: I4b0092f26a3719147bce9db75912b4264ce39159