The missing headers were being transitively included through a Skia header which is being removed. Change-Id: I6a5b26c1f1bb3ed4c65e7e39fff3b927cb14eabf
Adding a new folder in development/samples is not enough to have it be packaged with the SDK. Make sure to edit development/build/sdk.atree to add the sample to the SDK build.