am 5a9fc269: Properly merge \'Patch to enable low level traces.\'

* commit '5a9fc26993404305ebebdd432258bd7d563fb2e9':
  Properly merge 'Patch to enable low level traces.'
tree: 10ba0c5ec0aafb0be86f933317ab543c7d0cd1fa
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk