am 19d6fffc: am b6484d3e: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '19d6fffc67cdabb5a7bc5341e696515a05fe97ab':
  Get rid of LOCAL_MODULE_TAGS := user