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

Change-Id: Ibe7d0536ec061763f7b088917381a0da6e4c7453