Merge "Remove sdk extensions from module_lib / system_server api databases"