am bdd8dd7d: Merge "Fixed compilation error #include <android/*h>"

* commit 'bdd8dd7d1fa6fa2f791e4e85e924333add90bb58':
  Fixed compilation error #include <android/*h>