Merge changes Idf2c9bd8,Iec48362f

* changes:
  Remove unnecessary art.module.api.annotations
  Remove dependency on dalvik.annotation.compat.VersionCodes