Config fixes for android platform