Merge "Don't complain if non-public libraries in subdirectories can be loaded." am: c08b75a063
am: 11c67de4a7

Change-Id: I7d17f409724d78eef539418b47c65a1e2fd6bf92