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

Change-Id: I6a7f8aa8e984f70651a289bc01ed5443d6a9dcdd