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

Change-Id: Ife43b2a05f596ed2946f6fbe4942984968ef2cc6