Merge "Use package manager stock flags to pull lib info" into pi-dev
am: 2bfb9a15ad

Change-Id: I420e5273c5869f660cbcf9ac02120dc76f203985