Merge "add nopreload option in public.libraries.txt"
am: 6b20b7cff8

Change-Id: Iad237dabf74e7485e4da71c9d3fc0797965230a2