am 39458455: Merge "Remove unneeded realpath that was causing bad dependencies in a clean build"

* commit '394584556dac07794a092cf0098089ebdb5b81d0':
  Remove unneeded realpath that was causing bad dependencies in a clean build