Merge "Enable thread to call Java from GenericPlayer"
am: db8296e205

Change-Id: If64f81fc9b3ae9e0f88959d6dc565589a8b4f4ed