am 1162372c: Use the feature list for the SDK.

Merge commit '1162372c9e7ff4b6e60d247fb057b47f571af86f' into eclair-plus-aosp

* commit '1162372c9e7ff4b6e60d247fb057b47f571af86f':
  Use the feature list for the SDK.