[automerger skipped] Merge "Specify a default module for TARGET_RECOVERY_UI_LIB." am: 9010493189 am: 1da2937623  -s ours
am: 2991503f86  -s ours

Change-Id: I9af5c16f0822fde7dd5e894b04e81b6a1cfb3dc0