Merge "Remove libandroid_trace" am: 242c212b80

Change-Id: I861fa8ecf6ac2582878ba0d20a5131f1861cc586