am b6484d3e: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit 'b6484d3e816812bf1fac83b7606a9a590a846226':
  Get rid of LOCAL_MODULE_TAGS := user