am 11bf9e5c: Merge "Add support for dalvik.vm.isa.<instruction set>.variant"

* commit '11bf9e5c2f90101d56d918e1b3fe780b873e5566':
  Add support for dalvik.vm.isa.<instruction set>.variant