Merge "Revert "[WebView] Clean up code for finding paths and sizes of native libs""