am b101f73b: am 43bbbf8a: Merge "Remove more of the pathmap."

* commit 'b101f73be95aade6719d1d92c8afbb3df8a0d4c9':
  Remove more of the pathmap.