Bug 1107314 - Fix use of ANDROIDFS_DIR to ensure consistency so that builders can override.
Merge pull request #77 from aosmond/bug1107314

Bug 1107314 - Fix use of ANDROIDFS_DIR to ensure consistency so that builders can override. r=mwu