Replace unversioned python macros with versioned ones

Bug: 1067273
Change-Id: I7dd8fe74d53b5f9c43190880b29412d77a2db6a8