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