Fix some use of deprecated APIs in Support7Demos.
am: e8e0eae260

Change-Id: I0a62610e41bb7142e18312a15bba6dd9d4557c21