Fixing app-compat stuff for eclipse and AS.