Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL" am: 9bfd9f558b am: 10f4044341 am: 857230c5d9
am: f1f765e454

Change-Id: I32a47a4dfff0e40ed45f8e62839e1b20da5cee0e