Fix defaults

Conflicts:
	products/AndroidProducts.mk