Android 7.1.1 Release 48 (N6F27I)
Merge "Add core-oj to the list of dependencies"
am: 3d48bd3d08

* commit '3d48bd3d08a433fda3135a6ab4fbf8803e9c50b3':
  Add core-oj to the list of dependencies