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

Change-Id: I5b09e2f8027b8067246b82a896106be14eeca053