Merge "Use package manager stock flags to pull lib info" into pi-dev