Merge "Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." am: c164c831 am: 9ee9e6b2 am: 09ad1cbd -s ours"