[automerger skipped] Allow files generated by droidstubs to be copied in the SDK am: 7aa3039ef9 am: 8be676d24a am: e5ab595059 -s ours
am: ee9718c01e -s ours
am skip reason: change_id I7a0b22907603e1d17ac05901ee7f8bb9cff89f7f with SHA1 a0171af06f is in history

Change-Id: I057c4d6a204e50a09917203856d75f34c3c0601d