Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." am: 13310fef am: 250e9629 -s ours am: d4dcd2b3 -s ours Change-Id: Ic93192b6ed8d4c69b07443bdc6cab665a79729df