Merge "[libnativedisplay] Cleanup map file usage"