Android n mr1 preview 1
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: I5c32bce3670267f13d5453bc627e2a46b1e570b1