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

# By Leo Liao
# Via Brian Muramatsu (1) and Gerrit Code Review (1)
* commit '29d74ad5ce67238f7f03d4b52ce7cb4fa94a24c0':
  Add missing features of JELLY_BEAN to feature list