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

Change-Id: I938efe7a2359302cbf4d5d6f786f963044e1bbbd