am cc3b0c41: am 5c11a76b: Merge "Add debug.atrace.tags.enableflags=0 to /default.prop."

* commit 'cc3b0c411389a7f8dbcc9317614f9027585cc3d0':
  Add debug.atrace.tags.enableflags=0 to /default.prop.