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

Change-Id: Ia4ac454ed443c2a3e4357d8f098f669ac92d1240