Rework AndroidProducts.mk