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

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