Merge "Restore android SoftReference javadoc"