Merge "development: Set LOCAL_SDK_VERSION where possible."
am: 76ce83e999

Change-Id: Ib75188c828a55664fa6cd4628a4bb9c242bfb074