Merge "Define DT_ANDROID_REL[A] correctly for a test"