merge up to d2.

video rotation no longer crashes device.

Change-Id: I0d34afa9bcf854de48a9fe4da7a5e562c2187b60