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

Change-Id: I9d485ae2e9a6051a81caa2b5bf482725fc79184e