Merge "Change includes to support new slicer header location" am: 08a6c3dd9f
am: bb6b11d14c

Change-Id: I538671feb36df3339135bb7a60463aa7da3b89ff