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

Change-Id: I31deb62d1e2263f403c85ca392d57e8616138a22