Merge changes Ib132c1e2,I2115f086 into udc-dev

* changes:
  Revert "Remove JNI per-frame allocations in Choreographer"
  Revert "Copy from DisplayEventReceiver.VsyncEventData"