am 9d461e30: Merge "Add v7 support libs to path map." into jb-mr2-dev

* commit '9d461e3080375a701c61b29d1901928e7272f4df':
  Add v7 support libs to path map.