Merge "Include linux/fsverity.h and remove inlined definition" am: a91708379f am: 1043c0ce5e

Change-Id: I47d7f5a4e45691f2cb53647541ba379e93c05c6e