Update android annotations. Do not add jdk annotations for android sdk
Buildserver auto merge