Merge "Frameworks/base: Fix potential NPE in Script"