Merge "Standarize on VFS_CAP_REVISION_2" am: 6428ed2f85 am: f99800d245
am: c1a5a9b1ab

Change-Id: I292057cb00e691aec14e67527cb9e2068d29169d