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

Change-Id: I73179b52f72d82b167d4bfaf38493feac89484a9