am 8e9b03f9: am da133d84: Cleaning Manifest and re-adding systrace.

* commit '8e9b03f9b26f75e1293cac9e658983d2d4a6d963':
  Cleaning Manifest and re-adding systrace.