Merge "Remove SDK dep from module_lib_api" am: 51ef4aafe2

Change-Id: Ie917f4adc878d65f43d1e2134a50bfda0fb52ec7