Merge "Add aconfig declarations to f/b droidstubs" into main