Update Android tag maps

Fix #63