Android N MR2 Preview 2
Merge "Replace core-junit with junit"