Merge "nuplayer2: Fix two use-after-frees" am: b6eac609bc
am: baa7ec9b3e

Change-Id: Idf13fe90334462de5f30b04f25b1e0a7c1dc8709