am 6c86b774: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '6c86b77423a33e8b06c4dd4337cdc13696513b1d':
  Get rid of LOCAL_MODULE_TAGS := user