Merge remote-tracking branch 'aosp/upstream-master' into aosp

* aosp/upstream-master:
  mkfs.f2fs: enable VERITY by default

Change-Id: I6baf6df6503184a774a3e32a72125366706669c6
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>