Merge "SurfaceFlinger: migrate capabilities to surfaceflinger.rc" am: 1f3e40e8e7 am: f0b712654a am: 20c23f681f

Change-Id: Ie5494744cacf65157f180ffd62691da5278a8d91