Merge fences when needed for accurate timestamps.
am: bc52c7039c

Change-Id: Ib0e177944ec6a163a1572e91b04515d7e4536358