Merge "Some files for the SDK are now built in a different place" am: 2e9d2a0112
am: 085de0e20f

Change-Id: Ibb766c7f7c368cb2c78c47e7f0ed3be9baf738a5