Merge \"Rename DT_MIPS_RLD_MAP2 flag to DT_MIPS_RLD_MAP_REL in NDK headers\"
am: 46ba021a2b

Change-Id: I3579945786c00f99d49e210d272e70f8db7b8cc5