Remove support library and use jar from compat