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

Change-Id: I58e8ff0d06708d42ff2dbfe4cb85820dfb4c05d3