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

Change-Id: Ide2c8d2f7e91cf0a3c5679e4bf06115bc3c232d8