Merge "Frameworks/base: Fix always-false equals"