Merge "Get correct native library path on reinstall" into gingerbread