Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." into pi-dev