am 5f61087e: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '5f61087e26013ea2623aecb1783c74a57a9fa49c':
  Get rid of LOCAL_MODULE_TAGS := user