Merge "Remove dependency on -no_art variant"