Refactor defines for more consistent naming with ubi-media.h
Fixed bad import in extract_ubi.py