Merge "Remove --hide-package options from droidstubs" into main