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

Change-Id: If97a15a7f7b6a066bbf46db3497270a8c9a81026