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

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