ifdef some file system options that are not available in older trees

Change-Id: I11a7e441f7fe4e556a5349822150493de90095f1
Merge "ifdef some file system options that are not available in older trees" into android-4.4