Merge "Libcore: Clean up library loading" am: c189d8f0d6
am: c9d7a0d029

Change-Id: I28bb796f0a2ae4fa53d0d891e2c9b187f84bea7b