Merge "Remove libandroid_trace" am: 242c212b80 am: 7d36816ecd am: 7e2c27581a am: bcd3b9c997 am: 2adaf74b30

Change-Id: I7d256d3477607ceed70f6f878a3c6e21963306af