Merge "Refactor public_libraries.cpp more"
am: d662792de5

Change-Id: I99a2b357ca2cb15d87c32f0c571c6682be1ea365