am ade2d9c4: am 02d918b0: Merge "common debug flag for the wrapper libraries"

* commit 'ade2d9c49e23fe1d161bc95e9c74d2701f5b6e91':
  common debug flag for the wrapper libraries