Merge "Always use shared memory for atrace." am: 2ddc5a1932

Change-Id: I178514bd3d57cd406f2e243a1856a2a13d0326f8