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

Change-Id: I3ec78682eb33de06d263f5a95b927c5dfb2135f5