Merge "NFC: Switch ATRACE_BUFFER_INDEX to be a more friendly macro statement."
am: 9c45a2f391

Change-Id: Icca724639551e5ac843a7caa46838aea1393bf83