Merge "Add support for dalvik.vm.isa.<instruction set>.variant"