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

Change-Id: I984b5ee633078401769d3c649aa9b020715772df