Merge "Use menu shortcuts in ApiDemos" into pi-dev
am: 08207ad842

Change-Id: If446c07ae76b0d8fd4f6adb0106d6e77ca6ae4bf