am 25318f32: am 4b981bc8: Merge "Fix Clang compilation errors."

* commit '25318f3270d4784fdcd686d18ab351f27688de94':
tree: 85ee24cff1a17cebae35acbac8c9c9420524a608
  1. halimpl/
  2. src/
  3. Android.mk
  4. CleanSpec.mk