updated android sdk references based on latest sdk
merging