Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ib4c90d47d0d64db2c116a47f026fb8a4c78461f9
tree: f622075e94f61446a9a6926648475dfedae5849f
  1. api/
  2. cmds/
  3. library/
  4. samples/
  5. utils/
  6. Android.mk
  7. MODULE_LICENSE_APACHE2