Merge changes from topic "revert_sysprop_trace"

* changes:
  Revert "Adding system property tracing"
  Revert "bionic_systrace: moving global static variables"