Merge "surfaceflinger: initialize ActiveConfigInfo fields." am: f4dca6bc7c
am: fbbbd1b3a7

Change-Id: I824261d38c69a6b9bf7d95e815a527202ff1867b