Merge "Remove LOCAL_MODULE_TAGS := debug" am: 763bac7826
am: 67d1b381f9

Change-Id: I5424815da6e04e4f36e09f896069dd90e002a7fa