am 531bea7e: am 5da700bd: am f0f11379: Merge "Include the libcore native library for tests"

# Via Android Git Automerger (2) and others
* commit '531bea7e4e3105f61f1cab91ab4bf1d963898932':
  Include the libcore native library for tests