Merge "[SurfaceFlinger] Fix HWComposer error message." into pi-dev am: 02a7a668c4
am: e4fb763503

Change-Id: I5376d7556bc29b48ef478a0ba30c57ef6f288084