am 9f75fdb2: am 28e88a79: am 1792efc9: am 0f39674f: am 86632c90: am 29d74ad5: Merge "Add missing features of JELLY_BEAN to feature list" into jb-dev

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