Merge "Standarize on VFS_CAP_REVISION_2"