Merge "Add libjavacore dependency for oat tests"