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