Merge "Frameworks/base: Fix a comparison"