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 (3) and others
* commit '1792efc912b98fc4733bb718e82373dd92f9930c':
  Add missing features of JELLY_BEAN to feature list