Merge "Refactor public_libraries.cpp more" am: d662792de5
am: f43a5e4a80

Change-Id: I7797bd4602ca7b9397c8d8e4fd6c4786922eb9b3