Merge "Move SkMovie into frameworks/base"