Follow-up for r179082: more careful handling of -f(no-)sanitize-address-zero-base-shadow on Android