Merge "Remove SDK dep from module_lib_api" into rvc-dev am: d3bf9fdefd am: ca18147bfb

Change-Id: I2543e0d6764de82a51b899924cb6924195df08d0