Merge changes from topic "add-prebuilts-for-android.test.base"

* changes:
  Add prebuilt target for android.test.base.stubs
  Import optional/android.test.base.jar from build 4487031
  Add optional/android.test.base.jar to update script