Android N Preview 2
Merge remote-tracking branch 'toybox/master' into HEAD