Fix derp due to recent change of toolchains

Change-Id: I15a2e0aeeff5cc15fe8059c7985ab217f3b9aaff
Merge branch 'aosb' of https://github.com/spezi77/android into aosb

Conflicts:
	default.xml

Change-Id: I47e8c7d106153866e78fbf3b02e5180849e8491a