Merge "Add v7 support libs to path map." into jb-mr2-dev