Merge "Remove LOCAL_MODULE_TAGS := debug" am: 98d261c0a1 am: fd2a17c268
am: 438eeed270

Change-Id: I465f5f6290fad04067bf95a13f2f39935bce2cd2