Changes to support attribute support and stateanimdrawables