Merge "Remove LOCAL_MODULE_TAGS := debug"
am: c6565628b4

Change-Id: Ic20229ebe2e8b6aa3bd0505e38378cc5ca78e881