Also include some Android specific header files. Change-Id: Idbcbd43458ba945ca8c61bfbc04ea15fc0ae4e00