Merge "Set LOCAL_SDK_VERSION where possible."
am: 75a75c41d3

Change-Id: Ia99b885ab07dbe49f688bab2aff33ebd38b51009