Android CTS 5.1 Release 17 (3736405)
Merge "genext2fs: update fs_config calls for capabilities change."