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

Change-Id: Id952d793b49593c193c47a7ef530fd048e0573e1