Merge "Remove dependency on -no_art variant" am: 2ccde89153
am: 1f5228709c

Change-Id: Ib04dba9f020f5f28344bdd8c2a32eebb3f95c59a