Merge "Annotate large droidstubs modules high_mem"