Merge changes from topic "test_suite_harness_bp"

* changes:
  Add tools jars to general-tests.zip
  Move general-tests intermediates out of $(PRODUCT_OUT)
  Rename general-tests-* variables to general_tests_*