Merge "Fix minSdkVersion for test."