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

Change-Id: Ib20aaca83fa169182f473eaf90146e3c59f74c99