Merge "Set LOCAL_SDK_VERSION where possible." am: ad9b610acf
am: c87ce7d8da

Change-Id: I97976f795f5803a5009033b6847aaa0aaccc2324