am 86632c90: am 29d74ad5: Merge "Add missing features of JELLY_BEAN to feature list" into jb-dev

# By Leo Liao
# Via Android Git Automerger (1) and others
* commit '86632c90490e7979c1a7a2a4d409a669646ced91':
  Add missing features of JELLY_BEAN to feature list