am 66331624: Merge "Fix prebuilt library dependency for multilib build"

* commit '66331624b5422a608607a9924f174ba533573032':
  Fix prebuilt library dependency for multilib build