Merge "Fix concurrent access bug in VrFlinger." into oc-dr1-dev
am: d90e5399a4

Change-Id: I73730c662401aded83ffcae6430937a2472ae071