Merge "Deal with unreliable VSYNC signals due to scheduler." into oc-mr1-dev
am: d3da615084

Change-Id: I42758ffcf8e9a2c1f8a27b935aea3f91032f41b9