am 04c48584: Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom

* commit '04c485843f9fce0f66d18cb96e1051b7382b1f38':
  Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.