am 978afbdb: am 6f0634d6: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '978afbdbf1e4b5e950f419ad5c24d08cd7df1f6d':
  Get rid of LOCAL_MODULE_TAGS := user