adapt to android L
Merge branch 'dev' of https://github.com/IstiN/android_xcore into dev

Conflicts:
	xcore-library/xcore/build.gradle