am 70451aea: Merge "Change phony targets to set dalvik.vm.usejit properly"

* commit '70451aea314de4743d2d15a48d33201a897c190d':
  Change phony targets to set dalvik.vm.usejit properly