Some files for the SDK are now built in a different place am: 404f66903c
am: e7761ad5fd

Change-Id: I0bf2130c3ed090a486cdac297e5b83aef14ee035