Merge commit '49237345d83e62fdb9eb8d50b13ad086636a04fa' into eclair-plus-aosp * commit '49237345d83e62fdb9eb8d50b13ad086636a04fa': Add platform infrastructure for features.
Merge commit '49237345d83e62fdb9eb8d50b13ad086636a04fa' into eclair-plus-aosp * commit '49237345d83e62fdb9eb8d50b13ad086636a04fa': Add platform infrastructure for features.