Merge "Standarize on VFS_CAP_REVISION_2"
am: 6428ed2f85

Change-Id: Icb28dd3ec52e5f0a6fecbfb9cae0680978ec0946