am b2416d8e: resolved conflicts for merge of bbb41a70 to mnc-dr-dev-plus-aosp

* commit 'b2416d8e5c6ce31edb40df6fb3998716940575b9':
  build: Fix "adb shell" in recovery for system_root_image.