Merge changes Iccedcb9b,I632c052e

* changes:
  BootAnimation: Minor whitespace fix
  BootAnimation: Avoid memory leak in error case

cmds/bootanimation/BootAnimation.cpp

@@ -1157,10 +1157,10 @@ BootAnimation::Animation* BootAnimation::loadAnimation(const String8& fn)
 
     parseAnimationDesc(*animation);
     if (!preloadZip(*animation)) {
+        releaseAnimation(animation);
         return nullptr;
     }
 
-
     mLoadedFiles.remove(fn);
     return animation;
 }