am f9099545: am 7a659da9: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit 'f90995451089db8e5d4a72641e74cf2e5c35074f':
  Get rid of LOCAL_MODULE_TAGS := user