Cleaning Manifest and re-adding systrace.

Change-Id: Ia2efee723fddb401a6044cbe812d71d6fe14b133
3 files changed