Merge "Change animator xml importing to use new inflater class"