Merge "Added new android.test.base targets"