Merge "Set LOCAL_SDK_VERSION where possible." am: ec8a68a4cf
am: 3793d73e85

Change-Id: I357787ab65b82784ef5607aee2def933148349e7