Merge "add surfaceflinger and servicemanager to animation class" into oc-dev