Merge "Move JetPlayer to JNI" am: 77185b7f00 am: 23986da952
am: bab95e0b6f

Change-Id: Iaef9d83ff2ad281369b91e3f8a2356bcfc69bf77