Cleaning Manifest and re-adding systrace.

Change-Id: I1ed1e07df79aace07e2dbd520d77d0dee9c3cef8
3 files changed