cleanup headers for SDK.
bug 3421901

Change-Id: Ia7018af4e27cd52818a8891b37d09e96639bba15
2 files changed