Merge "Fix clang static analyzer warnings."
tree: add9cc703d778f79c047264542b508d29dbf2de7
  1. Android.mk
  2. bordeaux/