Merge "Apply annotations to stubs and stop exporting droiddoc dirs"