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

Change-Id: I29b1edd487725933ffcf4e2eeb8c79281a2a14f5