am 2d17b1ab: resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp

* commit '2d17b1aba6ea529dc618d50c784f69fb7f1a8141':
  Build only modules required by the current product.
  Load only the current product config makefile.
  Run clean steps in only given paths when using mm/mmm