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

Change-Id: Ife6695461a31c7e80eb191d7d037b57fe1d7fcc7