Merge "Support external display rendering in vr flinger" into pi-dev am: 5f643f8f4f
am: 436ddb1459

Change-Id: If1f43c895df9ddb7a2d842b504c74617d1480139