Also fix up the new support API demo documentation. Change-Id: I7a6945ffafa6a93cd394d5ce5729d6f9dfc0a183
Also various cleanup in other demos. Change-Id: I4f5669117e28312bcd4b28795c5eca5f4ab6dcfb