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

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