[automerger skipped] Allow files generated by droidstubs to be copied in the...
[automerger skipped] Allow files generated by droidstubs to be copied in the SDK am: 7aa3039e am: 8be676d2
am: e5ab5950 -s ours
am skip reason: change_id I7a0b22907603e1d17ac05901ee7f8bb9cff89f7f with SHA1 a0171af0 is in history
Change-Id: Ifc807f1442002e886efbfe207b94b57ba7bd7f1c