Merge "Stagefright: Transition to uninitialized state after freeing node"