Use namespace instead of macro for array overriding

Bug: 228647959
Signed-off-by: Shiyong Li <shiyongli@google.com>
Change-Id: Ie606832a12ea9131ab8740031442963f7599ceb5
2 files changed