Merge "NFC: Switch ATRACE_BUFFER_INDEX to be a more friendly macro statement."...
Merge "NFC: Switch ATRACE_BUFFER_INDEX to be a more friendly macro statement." am: 9c45a2f3 am: 527710b2
am: b8824108
Change-Id: I0482ba483d9e05dd97abf25c013f930f9146b2f9