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

Change-Id: I35d164715d2ac3bdd1fce13efed805abfe661cce