Merge "Support "LOCAL_SDK_VERSION := system_current"" into lmp-dev