am 0964bb20: am 338b1884: Merge "Improve/flesh-out shared library version check." into jb-mr2-dev

* commit '0964bb20f4798c9b25334dccbf2c5a14b33e6564':
  Improve/flesh-out shared library version check.