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

Change-Id: Ia717c3ba84359105e17412d0cde5f8c89590e254