am 6f5ba934: Merge change I42a0f7a5 into eclair

Merge commit '6f5ba93469bc26f33b5a260a394406970536c260' into eclair-mr2

* commit '6f5ba93469bc26f33b5a260a394406970536c260':
  PackageManager: Support secondary ABI for native code at installation time.