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

Change-Id: Idb0c9fdb897c62b6c535a5b326ea3e26beb07568