Merge "Fix linker compilation with timing enabled"
am: be128f38d6

Change-Id: Iaee80451d114030b36961a3ff2647bd4492f37b3