Android N Preview 2
Merge "Add core-oj to the list of dependencies"