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

Change-Id: I3596c6a7126f154e9c0b0bcf737c55dd5086f562