Merge "Remove libandroid_trace"