superderp
Merge branch 'jb-mr1.1-release' of https://github.com/AeonROM/android_build into jb-mr1.1-release

Conflicts:
	core/tasks/apicheck.mk