Merge changes Ied54c246,I0ea83bc8,Ibd8cb61d

* changes:
  Create test-legacy/ for android.test.legacy target
  Add android.test.legacy.jar to SDK build
  Add android.test.legacy target