Merge "Allow files generated by droidstubs to be copied in the SDK" am: aa1c6bb4b3 am: fac0ac32f9
am: 8d0419cb6c

Change-Id: Ib0abd57898d07f8b4f075c5a522d6c528bce8e8b