Fix some SDK build breakage.  Not all.

Change-Id: I2791b0a7c48d03cb6e5ca93771efb56c0a0c1956
2 files changed