[automerger skipped] Some files for the SDK are now built in a different place am: 404f66903c am: e7761ad5fd
am: a0f88adc87 -s ours
am skip reason: change_id I2dafafc113e7e5c77d469b69b7fe9f25cc0555b1 with SHA1 52633e91d1 is in history

Change-Id: I9a2f84b1569cf7563cb40352307587457262a6de