am 24b6e583: am 43362466: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '24b6e583a57b8c3dd2aa3a79ddbc360ac504d8e9':
  Get rid of LOCAL_MODULE_TAGS := user