Merge "Fix where we populate the FUSE <-> Android logging enums"