merge in jb-mr1-release history after reset to jb-mr1-dev
tree: 6218316845ad145937fc082f7e16405f9fa7f665
  1. src/
  2. Android.mk
  3. CleanSpec.mk