Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" into mainline-prod