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

Change-Id: I152d0c5dee4e8148da44a557d7575cb275636f27