Merge "Add hostdex target for android.test.base"