Merge "Move tests added in n-mr2 into new aosp location."