Small fixes to compile within the full android build tree