Merge "frameworks/av: Set LOCAL_SDK_VERSION where possible." into pi-dev am: a297137ad1
am: 7cdf1308cc  -s ours

Change-Id: I8cb2b3f07e5cf2a92829050cada04e9a1eeb0141