ADT: Fix some potential NPE in the configuration composite.

This is just based on Eclipse static analysis of potential null pointers.
It doesn't mean we were ever going to have any NPE there.

Change-Id: I2a326048d2eb6afff7598f9300f48e35495ff3c2
1 file changed