Merge "SurfaceFlinger: migrate capabilities to surfaceflinger.rc"
am: e03e9dd1aa

Change-Id: Ic335022ac766f71fce67697b793b78af93bd22fa