am e043deb5: Merge "Add libjavacore dependency for oat tests"

* commit 'e043deb5e5e878ca11ca84fbc58a55a33546ef8a':
  Add libjavacore dependency for oat tests