Merge "Set LOCAL_SDK_VERSION where possible."
am: ad9b610acf

Change-Id: I47651d14a6b32cb7bcb81362d94c9651cc8120d9