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

Change-Id: I80eec84fe15876049cbfe82c4d7d8072508868fe