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

Change-Id: Idef4f9ca7b2714b490d423461a40b3ab0298cda6