Merge "Remove kRestrictCompilationFiltersToImage"
am: eef560e257

Change-Id: Ib645687b2f18dc58a8f9a0891baeff8a653acb45