Merge "Adjust map names due to new bpfloader" am: 9613bfd2a4
am: 59ce36a44d

Change-Id: I28a2e41a354abdd8b2113c927a6489ea8710b431