Update recovery and build

Change-Id: If6fec0ad06d1beed496c661219f05707da3fe14b