am f2cc2e52: am 8735c4cd: Merge "Get correct native library path on reinstall" into gingerbread

Merge commit 'f2cc2e522177683145b2daa0de0ed898b865824d'

* commit 'f2cc2e522177683145b2daa0de0ed898b865824d':
  Get correct native library path on reinstall