Merge changes from topic "am-10d9c021ab4e44f3b99009e7bfee3442" into rvc-d1-dev-plus-aosp

* changes:
  libf2fs: fix build error on Windows am: a0823d077c am: 15936d35f5
  [automerger skipped] Merge remote-tracking branch 'aosp/upstream-master' into aosp am: 54ca36c551 am: 65a0fb612d -s ours