Merge "libz.map.txt: api 21 is the beginning of time. am: d9a17edad9" into main-kernel