Merge "Add support for TARGET_RECOVERY_BRICK."