Stop overwriting surfaceflinger.rc am: 0d977b69ff
am: d393ed2226

Change-Id: I1f83c12cc8acc5c92d045084417b41054c119c75