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