Merge "Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." am: c164c83191 am: 9ee9e6b2b6 am: 09ad1cbdc0  -s ours"