Merge "libcutils: Socket type might contain bitwise OR flags"