merge from open-source master
tree: 8bc17288d291c3034eb08e5bef32928f9f78a3ae
  1. src/
  2. Android.mk
  3. ChangeLog
  4. config.h
  5. main.c
  6. Makefile
  7. NEWS
  8. README
  9. setup.c