Merge "SurfaceFlinger: prevent division by 0 in Layer::fillInputInfo" am: 19143968d7
am: 3206a42d84

Change-Id: I2a0463ee6bca3c0062b49bf808ca7cbb24349469