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

Change-Id: Iaf7180c6ea33befb4fa6eafb946be4d14f876fa0