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