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

Change-Id: Ib16c0ff647fe0d6da63c6f562458ea047c6756d4