【eric】 clean for merge
Merge branch 'master' of https://github.com/gdonzy/dalvik-aot

Conflicts:
	project/debug.sh
	project/dexmain.c
	project/tem.log