Merge pull request #124 from jpsim/jp-overlay-fixes

fix issues preventing overlay from compiling due to SE-0025

Signed-off-by: Daniel A. Steffen <[email protected]>

Author: DougGregor

PATCHES

@@ -268,3 +268,4 @@ github commits starting with 29bdc2f from
 [98d0a05] APPLIED rdar://27600964
 [8976101] APPLIED rdar://27600964
 [0d9ea5f] APPLIED rdar://28486911
+[e7e9a32] APPLIED rdar://28486911