Merge change I2edfb71d into eclair

* changes:
  Support secondary CPU ABI in build.prop