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

Change-Id: Iedbb541ba2fa5916048e3f40d5cc128a83d0dc6b