am 1b5ecdc7: am 47869b6e: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '1b5ecdc7bb55511066c0c05395035f3a816e82b6':
  Get rid of LOCAL_MODULE_TAGS := user