Merge "Remove LOCAL_MODULE_TAGS := debug" am: c6565628b4
am: ae9ba44ef0

Change-Id: Icd6068f3b31a05cceb0b1b9b7ddbf8852db1c1e5