Merge "Add support for TARGET_RECOVERY_BRICK."
am: daf55776be

* commit 'daf55776beefeb3f59d2f7ca61796ad07fa1d738':
  Add support for TARGET_RECOVERY_BRICK.

Change-Id: I70a4682caca250d557975dcf19bfbf63bc567a24