Refactor to easy the import of apache source code.
Moving min sdk to 9.