Merge "Faked HWC for SurfaceFlinger testing"
am: b1299c5329

Change-Id: Icd4f3ae2cf5db8e01bcde08461b5e98503c1e11c