Initial commit
change build around
Merge branch 'master' of https://github.com/IOAP/android_build

Conflicts:
	envsetup.sh