Merge "bionic_auxv.h: fix #define conflict"