Android S V2 Preview 1
Merge "Fix ubsan error path found by libfstab_fuzzer"