am a4d0a67e: Merge change Ifb0a0398 into eclair-mr2

Merge commit 'a4d0a67ed02c56dceaae01f328381b280d8fc1b7' into eclair-mr2-plus-aosp

* commit 'a4d0a67ed02c56dceaae01f328381b280d8fc1b7':
  Fix build breakage.  Rename NetStat to TrafficStats in preloaded-classes.