Merge changes I30a83721,I1094f213

* changes:
  Validate args passed by jacoco.mk to rm -rf
  Implement validate-paths-are-subdirs