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

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