Merge "Hide warning in cutils/trace.h" am: 5cf3db6d2b am: a802e570b3 am: 06ec4b1352
am: 7673c4dc88

Change-Id: I556b9a6800480cc4cd9b1f5cc702d0ae460dd95e