Merge "frameworks/native: Set LOCAL_SDK_VERSION where possible." am: 8b3b108987 am: 52d0ad7033
am: 1d385c1268

Change-Id: I9746d2aa19a8926cfce37960af8c3db801528bcb