Merge remote-tracking branch 'origin/upstream-f2fs-stable-linux-4.19.y' into android-4.19

* origin/upstream-f2fs-stable-linux-4.19.y:
  fscrypt: remove filesystem specific build config option
  f2fs: use IS_ENCRYPTED() to check encryption status
  ext4: use IS_ENCRYPTED() to check encryption status
  fscrypt: return -EXDEV for incompatible rename or link into encrypted dir
  fscrypt: remove CRYPTO_CTR dependency
  fscrypt: add Adiantum support
  crypto: speck - remove Speck

 Conflicts:
	arch/arm/crypto/Kconfig
	arch/arm/crypto/Makefile
	crypto/testmgr.h

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