Update android sdk to version 21
More cleanup in Defaults