Merge "Use support lib shortcut manager in sample apps" into oc-dev
am: b0bcb8f365

Change-Id: I4d0ddab6405fe8990cab0de1e0a38e0060e74163