Merge changes from topic "build-fixes"

* changes:
  Add prebuilt-intermediates for xmlpool
  Remove unnecessary dependency tracking rules