Merge "Frameworks/base: Fix null-pointer check"