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

* commit '85bdf7e6fd82d68aa4f917e234bf525968c5fc66':
  Get rid of LOCAL_MODULE_TAGS := user