Merge "Add support for TARGET_RECOVERY_BRICK." into nyc-mr1-dev