Android 5.1.1 release 25
Merge "genext2fs: update fs_config calls for capabilities change."