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

* commit '96cea40fce3939716cfcf1bc8aaeddd99fa396ac':
  Add v7 support libs to path map.