Merge "packages/apps/Provision: Set LOCAL_SDK_VERSION where possible."
am: 01fab1d3e4

Change-Id: I6d11ec41935c0f8dfc16385573aa6de9d255e699