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

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