Improve Android packaging.