Merge "atrace: only start trace when starting trace" into pi-dev
am: 51e6abd610

Change-Id: Ief96f4d437860a403f1862fc47c3d386cbe87790