
Removing compatibility macros, and updating the two tools still using them. Change-Id: I636f045d76a8f92440ebe1503f52f7e5d704a316
Removing compatibility macros, and updating the two tools still using them. Change-Id: I636f045d76a8f92440ebe1503f52f7e5d704a316