am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support."

* commit '63a61e561d7d3d6f10488a194fb730f9edec3edc':
  Rename __unused to __UNUSED for glibc support.