Merge "Prevent NPE in 'android update project'."