Merge "Remove __INTRODUCED_IN_NO_GUARD_FOR_NDK(21)."