Minor updates for android source.