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

Change-Id: I48873e536f0b2587e97812b1d1b86f0153c6cde6