am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo

Merge commit 'e17b4e711571198f79c0c2bad3656d58c63629e8' into froyo-plus-aosp

* commit 'e17b4e711571198f79c0c2bad3656d58c63629e8':
  Adding the backward-compatible filtering heuristics for the new device