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

Change-Id: I4cfa3f21c957c32c8497051925fb34f3155817be