Merge "Fix warnings in frameworks/native/services/surfaceflinger/tests/fakehwc" into stage-aosp-master am: 60175af9c8
am: 0b7c1b21ad

Change-Id: I64037f95296d38a0fc26a7e82c63c586a3c02687