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

Change-Id: Ic0e3409d9f1dad3863a1e2b80c59ecc992aa819d