am 31597999: Merge change I2edfb71d into eclair

Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-mr2

* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
  Support secondary CPU ABI in build.prop