am a2ad467f: Merge "Support modules to be installed directly to recovery.img"

* commit 'a2ad467f7a82511901625aa8dd8253c19df87a1c':
  Support modules to be installed directly to recovery.img