am e97e78a0: Make unittests work, new TagBroadcastReceiver

Merge commit 'e97e78a0600e08b0e84edee96aea81145c0df44c' into gingerbread-plus-aosp

* commit 'e97e78a0600e08b0e84edee96aea81145c0df44c':
  Make unittests work, new TagBroadcastReceiver