expand out the A2S macro

Which is not doing anything useful anymore.

Change-Id: I83422e811d52a77b65655924c07b55dd7229449c
S2A macro is unused

Change-Id: Ia0caf81179289e565d69215d32cc132337b806cd
use standard css namespace prefix

Change-Id: I820faaa0dac1707f3224b981dae0bc6be5894503