am 47869b6e: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '47869b6eee503ccfb11444ce5cc33b9f08f83228':
  Get rid of LOCAL_MODULE_TAGS := user