Android 7.1.0 release 1
DO NOT MERGE: drm_hwcomposer: Count all layers with content in SquashFrame
am: c74c8b9339

Change-Id: Ibfe0a03568d74f2517eb86d4f97b7339a5bb38bb