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

* commit '406ba83154ba17921bc524c479d3339448306fc5':
  Get rid of LOCAL_MODULE_TAGS := user