Merge "Change LOCAL_SDK_VERSION"
am: b4afbfacb3

Change-Id: I5b6e163a05b97e0c110164f5d2968059aa6d503c