am 7140da22: Merge "dalvik: don\'t build unit tests on eng builds"

* commit '7140da22a1f295f68bb0d3d124c2f989b4eca19e':
  dalvik: don't build unit tests on eng builds