Merge "frameworks/native: Set LOCAL_SDK_VERSION where possible."
am: 8b3b108987

Change-Id: I206e23cddfc030cb835775c192e45dabe9ada536