Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."
am: c164c83191

Change-Id: Icd753634a498a9c1a2d2e27ad4e6cd788e7b9e1f