Android 7.1.0 release 7
Merge "Add core-oj to the list of core library jars."
am: 7de829dfae

* commit '7de829dfae22e9be8aa973a721d59c48d7f6fe7d':
  Add core-oj to the list of core library jars.
tree: 29bef7c7ee1b4f302dc86d26dabcf37776987c22
  1. src/
  2. Android.mk
  3. COPYING
  4. MODULE_LICENSE_APACHE2