Merge "libfs_avb_internal_test & libfs_avb_test already run in presubmit"