Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread