Merge "packages/apps/Stk: Set LOCAL_SDK_VERSION where possible."
am: e506d26453

Change-Id: I182401fcf2a71fd7d10624ba5d6ceab47f06b61c