am e870a487: am 002d1c24: am 31597999: Merge change I2edfb71d into eclair

Merge commit 'e870a487d6679eecca1f19524807cc2215922fb5'

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