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

Change-Id: If0de289267f9bbf8fbe80b8041b8b0d617e922f5