Merge "Fix deStrnlen fall-back implementation" into nougat-cts-dev