Android O MR1 Preview 1
Merge remote-tracking branch 'toybox/master' into HEAD