Merge "Deprecate LOCAL_MODULE_TAGS := eng/debug"
am: a734907705

Change-Id: I9b5469b27aa18e95010c52f41116ccf24045dd23