Android n mr2 preview 1
Merge "Replace core-junit with junit"