Merge "Standarize on VFS_CAP_REVISION_2" am: af03f483d7
am: cac2163a6b

Change-Id: I83b985e322648c697db500f3c7ac028714e08865