Android n mr2 preview 1
Merge "Replace junit4-target with junit"