Merge "Update android.test.base library"