Merge "Convert ShortcutSample/Android.mk to Android.bp"