Merge "Remove EXPAND/STRINGIFY macros." am: 6e7df82c7b
am: ad878d5494

Change-Id: I26f95122637228debd396ad07928273e1f776da1