Merge "Stop defining local "unused" macros now this is C++."
am: 3183c567b0

Change-Id: I34c0d37280510810ac27de45b33403b362ad0973