Merge "libcutils: fix rw FS remount check issue"