Merge changes Ie05a1759,If3b6fc63

* changes:
  Modify android.test.runner to use new mock APIs
  Add apis needed for android.test.legacy