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

Change-Id: I281613e742ea3ea5e2ff993a24bd569659aeb66d