Merge "Fixed incorrect usage of native fences" into pi-dev am: 57a532e60b
am: 54ccdea3ad

Change-Id: I6d8ee9b0dbe8bbb886b3d6cfba3fe64c75362f6b