* commit 'ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4': Fix several cases of broken droiddoc syntax external issue 35214