Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." into pi-dev am: d740e43bf7
am: ed972116bb

Change-Id: I72ce7f1c6242ddf9a5b36075761f3f1f1138cea1