Use system_modules on droidstubs and remove duplicated libs
am: 7d3b9479c7

Change-Id: I86a78f66c4e2add1348fef26382461b281f60351