Merge "android.security.*: use versions for imports (2)"