using the same propagation overrides for android as for JDK
update for new inferred annotations
Merge pull request #28 from JetBrains/rrk/klyuchnikov-android-annotations-fix

one more annotations fix