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