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

Change-Id: Ia3e868167c2c587a1f52867c3c059be3321e668e