[MS83.2] Make some APIs module-lib instead of system current

Test: m
Fix: 217479745
  (cherry-picked from ag/17118003)
Change-Id: Ief3f2304f11b7940a18b98b8533fbca85ffa4dc1
Merged-In: Ief3f2304f11b7940a18b98b8533fbca85ffa4dc1
4 files changed